Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 17 May 2010 12:37:57 +0000 (12:37 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 17 May 2010 12:37:57 +0000 (12:37 +0000)
commitc997048a772d73e571990cf4b9b27363a97a3106
tree580ac8693410b689f93ab0cdce4c836148a3602e
parent08adcb4cf60f123c0f49d5477a04e9f688dcccbf
parent6ccaf0f272934dff0d327b0c001653f010750dec
Merge from mainline.